From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 28 Jun 2013 15:51:13 +0000 (+0200)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c;p=project%2Fbcm63xx%2Fu-boot.git

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
---

e6c7f86f03b0ad25e9ef70df3ee1989b6b789d7c